Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 24 Feb 2010 13:25:54 +0000 (13:25 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 24 Feb 2010 13:25:54 +0000 (13:25 +0000)

Trivial merge